Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 3 Jun 2010 12:01:23 +0000 (12:01 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 3 Jun 2010 12:01:23 +0000 (12:01 +0000)

Trivial merge